DriboPlugin <3 and some fixes