first full run through with Nadya, fixing bugs