Some minor additions but site is down and I can't fake test stuff