Simplified file names
Implemented new tatonnement algorithm
Fixed some message confusion