Better var naming and minor bug fixes.