small fixes and touch ups