Minor changes in the classes, added more docs