various fixes after testing