Latest commit 21d6a03 @codyd51 Fixes, cleanup more headers