fixed all my bugs, I think...