Added feedback and resolved minor issues