collect more info
merged in changes from the weekend