fix bugs now that I cna test some