comment and favorite features added, need some touch up