Made some notes about the bugs...