Cleaned up some things in preparation for playtesting