pre working-with-roan on bugfixes