move attribute sources and fix typos