Some bugs solved. Code must be cleaned, but some tests will be performed first in order to find new bugs.