Fixed that pesky lighting bug. And my branch is now pretty stable!
Probably going to merge next.