Maintainance updated 1.2  + minor code tweaks