A little fun and games, a little bit of bug fixes