Imrpved comments and public API