Added/Fixed some thing in response to user feedback