major updates here and there