some bugs fixed, how-to, commas & roi