little fixes, and manager plugin