Assembly added. Some fixes peroformed