dependecies fix, code cleaning
started implementing iOS devices support