Fixed some annoying bugs (Oops)