some tewaks