Usage message generation improved
TODO updated
More error checks and new options capturing format
Manual merge