Bug Fixes

Doxy Fixes