commits from crpalmer - picassowifi