remove unused vars, finer shadowMap, add foldmarker