some bugs and new things