Wip celtic mechanics

merging super's latest fixes into my branch