Well that was just stupid
Some small bug fixes