small bug fixes & enchantments