respond to chrysn's feedback, update branch accordingly