Put state constants (FLUID etc.) into enum and added comments.