cmake issues and updated header info