small changes, added headers