fix bugs in untested functions, sad face
update to latest version of header file

cosmetic changes only
comment fix