Bugs

I have f...ed this up again