adding lighting (in progress), a bunch of cleanup