Updated config parser, fixed minor bugs