+ Fixed some bugs