updates - lots of debug stuff / fixing bugs