last edits before demo push