Lots of fixed issues