minor fixes with Brandons input