linting, updating test cases, addressing TODOs