first working version
small updates