fixed some more edge cases