couple more fixings here and there, links etc.