-cleaning up a few corner cases