Buuuuuug fixes O_O