plugins improved and some semantics added

it is starting my easter holidays, enojy!