small hacks here and there :)