cleanup and added nicer debugging with Dat.Gui