Various changes and hopefully fixed Project Red issue.