adding plugging, some fixes for object stuff