more clean up
fixed rsquare section