fixed some var. name