Performed several updates, let me know if anything goes bad.