Updates and critical bug fix.