Some fixes, some work on additional plugins