even more minitweaks