bug fixes, not yet done