Cleanup + user feedback fixes