Mora fixes and comment removal