Negipo/fixes

fixes from #2