Fixed a few merge mistakes and made new algorithms dynamically loadable.