small changes, todo resolves