- first pass 6809 bug fixes