various corrections and adjustments