more updates - almost final