Add some grievance and fixes #3