comment and cleanup add crosses