engine & propazham fixes