fixes and new field spell layout