modules + cmdline-parser fix build + merges