cname and minor changes, will continue in the morning