Fixed bugs in argument handling and some inconsistencies carried on from previous versions