fixed one more bug.. we are good to go.. well almost