Fixed up some things I changed just for debugging and testing