Finish Ultima rules + a few technical fixes