added some feedback and suggestions for improvements we got from the users BUG.PY comments