fixed a few lingering issues