[minor] fix up corners
[revamp] more corners