fixed a few warnings and typos