minor code fixes
Added "control" methods.