Fixed bugs and added simple changes

This commit fixes #1 and #2. It also changes the title according to the page.