Fixes - still needs a bit on optional subjects!