clean up and var fixes