commit lots of changes and fix some inaccuracies