final final changes and fixes