rest of info added and tweak