andrea's fixes
merging