Moved to real classname
Fixed to spec
Fixed almost all points of criticism