last minuted fixes, living on the edge