updated singles, removed infinite loop, still test and resolve minor bugs