first fixes
working version