Please forgive this flood of tiny changes ... this will be cool when it works