just class name changed
some fixes for bugs