made suggested modifications... still broken in a different way but in the same place