some code changes, added some lights too