Lot of minor changes. This is the version that went live