Bug Fixes and Title Change