various editting here and there