some minor changes as requested by Hanna and Matt