fixed some var names