started bug fix for fixed headers etc