Add some header development and some bug fixes.