validated and fixed issues