Fix pre
More tweaks