Added some doc & stuff