little ixes to singleton + more progress on TextEdit