Numerous Improvements based on Feedback