Fixes and doc for classes