small improvements
will run under ios