General Fixes, may combine lists into one for organization..