fix, cleaned up headers