some updates here and there