Lots of things to fix