small fixes in response to feedback prior to splitting up schemas