Closes #1 (closed). Adds default values for all cli parameters. Removes some TODOs. + a small bug fix