small stuff, mainly todos :P