Various Updates and Bug Fixes