fixed some bugs. Oops and commented code in preparation for lighting talk.