fixed some class names and made minor tweaks suggested by Hayg