light intensity + some minor improvements