CS fixes + cleanup
Updated: Plugin API to version 0.2.11