refactored values; added strings; fixed an open