Fixing class errors and adding service notes.