a couple of small changes, took out some console logs etc.
merged conflicts