Added and updated convenience headers
Various Fixes and Refactors