Few small changes:

    - Cleanup makefile a little bit
    - Some minor formatting fixes
    - Little bit of work on the options messages