Many things were fixed (2 to be precise)