Minor chages to a lot of stuff