fixes, speedwrap, closer