some testing and fixing