added lighting; fixed a few bugs