A bunch of little improvements