unit enforcements. small fixes and some polish.