Made several optional.
Merge pull request #1 from fs-webdev/optionals

Made several optional.