fixed some vars