add .AND. and .OR. to job parsing
clean up X-Window install
clean up main install
