Add+fix some corner cases