Small updates here and there trying to work things out