A bunch of various improvements