starting the long road of bug fixes