clean up include and minor stereo fix