last touches

should be last commit before presentation (hopefully!)