more progress, especially on shadows