Housekeeping

Gonna do some housekeeping, add some links and remove some. Hope I don't make a mess out of it.