Config fixes, Plugin is still incomplete!