Implemented a few minor changes from the monster branch