Terminology fixes.
Removed unused methods.
Implemented logging.