another bunch of small hacks :)