More tweaks
More bugfixes
More progress towards a working system
ALl tests passing again!
Remove Option from signature of format