Misc
More cleanup; Add get_current_plugin_count and get_max_plugin_number C API