added comments and one test (4 future)