minor fixes - final commit