minor modifications, realized some values were set to defaults, didn't
need to do that again, also realized there was an get param that wasn't
checked to see if it was empty (would throw up a warning)