addresses #25
fixes a few warnings