Small cleanup, added hidden rolls as a feature