Lots more additions and fixes