last minute minor fixes