General improvements

Random things which you might find useful.