Bug Fixes, Content Additions, Fixes #3