bug fix + more logging