Bugfixes and added more plugins