Horrible Bugs fixed