Beautification & Hotfixes

Issues  #130, #128, #127, #124. #123 and #76,  #102, #133