more small hacks here and there