Fixed several small errors

Expanded enchantment options.
Removed several un-required imports.