small changes
uncommented lines that didn't work. works now