angular structure, insight fixes