More options and Fixing Patch

The bookmark should work now. Now there more prompts available and input
checking. Also there is update thing now.