Extras: More cleanup, randomize props