Improved comments and documentation
UI tweaks