Cosmetic changes, bugfixes
Add reusable ArgumentParser