rainbows support & bug fixes