wrong class name and small fixes