fix the last bits....hopefully