Issues #131, #129, #126 & Hotfixes & Beautification Stuff

Issues #131, #129, #126 & Hotfixes & Beautification Stuff