added headers, fixed build