Stuff
Adding bug fixes