Removed the ContentRange inner class and other various issues.