Revert "Bug Fixes e improves"

This reverts commit 05644ed0476edb1180803df1bc47824dbe8e0b46.