minor tweaks
about to comb for bug