plugins fixed, need do some addon tweaks