Small update and bug fix.