Just a few small updates, this is a large work in progress