#24 fixed a few warnings