update class names and fix bugs