Fixed some issues and warnings
Cleaned up plugin, fixed callstacks