Adapted to newest libs
Major refactoring
New macros
Extreme CmdLine refactoring/improvements
Formatting