Fixed most of the "big" problems