fixing some stuff. was harmon broken as well?