more small fixes for additional edge