Performance improvements + Bug fixes