Few tweaks

Added messages for what items did and changed some stuff over to using
the enums.