fixed issues, works