Squashed merge from dev, commented code cleanup and tuned README