fixed fu$%ing errors