removed print, improved some text and further fixes in modules