Fixed everything

Uploaded the latest code.