Cleared some TODO and added new