Cloyster enum(musta forgotten is accidenatally) and other fixes.
Oh, and Cloyster, dont know how i didnt see him in the commit list.