adds classification
minor fixes
first beta