Fixed minor formatting and comment issues.
Added missing copyright header.
Made Database dependencies option.