cleaned up headers, pushed to cpp, fixed rendering font to surface