map(banana): various fixes and tweaks#879

KoboldCatgirl wants to merge 3 commits into

mainteamstarcup/starcup:mainfrom

banana-fixesteamstarcup/starcup:banana-fixesCopy head branch name to clipboard