- fix bugs remaining don