Updated some variable names and docs