Minor changes, the bigger ones didn't work.