Added other properties and fixed erros.