Added another random mode, bugfix