Fixing up some stuff and more sites