little fixes towards final submission