A lot of little things fixed