Got rid of outline for the rest, semi-publishable now