Added more docs, tweaked names of class-related functions and queries