fixes from final feedback