more scottfree fixes