todo: fix bug in android
cleaned some comments
more todo