heading adjustments, data types fixes