Had to do some late night fixes. Sorry