Add useful commandline options and clean up sources