fixes for latest SDK
cleanup comments
update pubspec