minor bugs
name refactoring