User modification
Newline fixes
Organised command interface