fix class name
better default properties