Fixed names
Added random key generation
Minor edits