minor bug fixes and enchant scenario