tweaks, uncommented code that I commented out previously