Minor Updates and Bug Fixes