All fixes from Your review will be done ASAP