some name changes, added "flush" methods.