Small typos and enhancements