More minor improvements. Bug sniping