bug fixes - wrong class names