solvin some bugs