final adjustments and fixes