Updates and Bug Fixes