Addressed some todo items