catching up on fixes + bugs.