some late night fixes perhaps??