Add comments
Fix test and installation issues