small updates here and there:)