More edge cases and stuff.