add small 'hack' to not way for rainbow cycle function to end for time to progress on face
general tweaks and cleanup