#148 bugfix +cleanup