Lots of changes from user feedback