iterative fixes and progress on proto model