Updates and bug fix.