Numerous small changes based on user feedback