fix #89
remove couple of warnings and comments