Got feedback and fixed one more bug