add bugs features enhancements