bugfixes
wut
handling an edge case