Minor cleanup and added some links