Fixed some vars and doc