fix the last 2 commits, this also merges the latest dev work