minor fixes and reversion to old issue to solve new issue.