More devtools, some updates and code clean up