Add node-random and general cleanup