last fixes and before project clean up