Lots of impovements