Added some doc and small manip