removed warnings
bug fixes