changed some stuff here for the discriminator calculation
deleted *.pyc files and *~ files