reorganize for clarity
fix visual artifacts

triangle shuttering and/or disappareance.