done
Added check for nil
touch-ups