finishing up... all discussed issues solved... some testing remaining...