BUG FIXES + LOGS.