fixed the remaining issues brought up by Jason