Lots of tiny usablity changes and code clean ups