Clean-up, added missing messages and corrected some warnings from
Eclipse