locked versions of gems and updated gemfile
belongs to bug
remove comment
checking for nils elsewhere