some refactoring and preparing for initial rc  release