fix and polish.