* updated last changes

the main functionality works, need some polish