THANKS, TODO, minor stuff