Remove debug
code improvements
Remove TODOs
#6 better output
Remove debug java options