Minor update to model and point code