Added code for a TODO in PluginLoader, fixed one of the methods referring to a class from before The First Great Repo Restructure (that's what I'm calling it :P).