Applied various changes for new knowledge database (no compile errors)
Manual merge