Fixed up simple handling and other bits