Moved some stuff around and added defaults here and there