removed a few warnings and depreciated methods