some fixes
modification naming