Made some small adjustments for safety reasons.