Even more updates, need to run some on sandman