some fixes basing on your comments