added todos and dev env fixes