New version, code cleaned and classifications added