add bugs and remove features