Fixed compile errors and finished AddString