Bug Fixes e improves