some updates (best commit message ever!)