several bug fixes
several bug fixes