Replaced mag.lab. with full name in most cases, do some reformatting and fix some typos