Added small fixes here and there