Some minor fixes and comments
Defines: Update, Indentation