Unlasting Horror: major fixes and improvements with polishhing

major fixes and improvements with polishhing