updated lots of stuff for nadia