Fix more bugs, add sentiments