Little improvements and commented thing TODO.