Did some helper spell adding and bug fixes