Added missing plugins

Also some code cleanup. Compiles and works now, although some functionality might be impaired. Could be due to still some plugins missing from the CMakeLists.txt