A few bug fixes, tinkered with info output