SINF0000 more make stuff and plugin integration