Fixed some weird stuff master801 did :P