Slight improvements
Bug fixed for random choices