Cloyster enum(musta forgotten is accidenatally) and other fixes.
Oh, and Cloyster, dont know how i didnt see him in the commit list.
Redoing some stuff i accidentally undid.
Merge pull request #723 from LightAdept/master

Fixed the Database not updating (ignore the other stuff)