Bug fix 161 and header updates