adjusted plugin system & stuff