few fixes and separate headers