merging tash and master
merging tash
fixin lights
pulled from master