Minor Doxzygen Documentation modifications. Minor bug fixes