Minor fixes 
+ autodeployment mechanism