more bucket fixes and gif map