Added more feedback and fixed a bug.