Fixed two bugs (seems working without bugs for now)
Generate random details instead of specified