numerous helper additions and work on sink