Updated lots of little things