Minor changes

Removing some unused #includes

Adding some #includes that might be needed

Using functions in namespace conv for conversion functions as exception
handling is complete