Changes do get rid of warnings found by Clang
changed the header - work in progress