Add chamfered corners and some cleanup