more improvements
more progress