more headers, more fixes, more todos