some fixes after testing 7 Aug 14