Speed up some things, fix #6