Small update and fixes
Small update and fixes