bug fix, additional testing, documentation amendment