Fixed even more all bugs