doxy and small warnings fixed