#107 #108 #114 #121 fix

Multiple beautifier fixes implemented, some javadoc adjustments and some code improved.