fixed issues, solved problem 24