Fixes, adjustments, etc