Solved bugs and rich features