Updated with lots of links etc
Clean up