Penultimate version

Still not happy with the error display, everything else seems good.