various changes

http://whatthecommit.com/b4c2c23cb236901867925204d28942ca