More boss stuff

Touched up some things that weren't quite working properly.