fixed all bugs!! :)