Jordan : commit

nothing new, just trying to fix some bugs I was getting