Added several enchantments, cleaned up code