Corrected some bugs on previous version

TODO:
    - check the static bool in some objects!!!!