minor bug fixes -- WIP