minor tweakage
minor tweakage and bug fixing and killing