fixes

more fixes based on meeting with jane