Added cli-args, fixed bugs, cleaned up hackyness