Updates to newer rhc syntax, formats a bit more.