Improvements + Bug Fixing