fixed @hajbi issues, and he has alot of them...