Performance improvements weeeee + Bug Fixes!