fixed most of the issues brought up by Jason