Fixed Stuff

Things should work....