Made some final adjustments