did some fixes based on igo's report