Revising chapters 3 and 4 for non beta release