add two cases and fix some