many bug fixes like renaming