Updated, added lots of little things