fixed plugin issues, should work fine now