fixing fu$%ing errors