accounted for a few more little things that would cause errors