new branch + add a few I missed