More fixes and some changes in plugin