fixed some stuff - still need info in writeup