more preparation for angular rendering
minor changes