Made minor changes and updated code adding todos to fix for later